[automerger skipped] DO NOT MERGE: Update location icon on changes am: e085352b am: a2cd16f9 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12437810

Change-Id: I49e9622d7fd70ece05c676a4621cb14ec770083e