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