[automerger skipped] Merge "DO NOT MERGE: Update location icon on changes"...

[automerger skipped] Merge "DO NOT MERGE: Update location icon on changes" into rvc-qpr-dev am: c4f4369f am: f8fc9223 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I97e331bb54489977795e53218899d82ba27d1619