[automerger skipped] Rename external storage properties. am: 94abf26ba2 -s ours am: fc56249ab6 -s ours

am skip reason: Change-Id I64c6d8ca49fbd72f923a8794df0929bd500dd8e9 with SHA-1 5a4a7fffb7 is in history

Change-Id: I524cd9c812f39bdc3ccb6f88803879c8ef869f10