Merge "DO NOT MERGE: Update location icon on changes" into rvc-qpr-dev am: c4f4369f

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

Change-Id: I545fbfb9a79d93e94a2971429fa269460c15aae8