Merge "[automerger skipped] Rename external storage properties. am: 94abf26ba2 -s ours am: fc56249ab6 -s ours" into rvc-d1-dev-plus-aosp am: d8e1ff028c -s ours

am skip reason: Change-Id I64c6d8ca49fbd72f923a8794df0929bd500dd8e9 with SHA-1 94abf26ba2 is in history

Change-Id: I8de53b56df9a9c8f5c138c01fdb60106f0d71606