[automerger skipped] Rename external storage properties. am: 94abf26ba2 am: e326e59dde am: 9f1c606aee am: 3b35589c88 -s ours am: 1ef22bbaa1 -s ours

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

Change-Id: I36acd5f8812a851132e78aa4ad8cafe3c6435005