Merge "Update icon only once" into tm-qpr-dev am: 754656a6 am: 45fe7a2d

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



Change-Id: I8853f6e83546b4122f7860f75f504183bb03b5c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>