Merge "[automerger skipped] Rename external storage properties. am: 94abf26b...

Merge "[automerger skipped] Rename external storage properties. am: 94abf26b -s ours am: fc56249a -s ours" into rvc-d1-dev-plus-aosp am: d8e1ff02 -s ours am: 4cc82659 -s ours am: 9e1a832b -s ours

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

Change-Id: Ic7c05a5ebcee464e4fbe4b113307a10da3aaf4c8