Merge "Update icon only once" into tm-qpr-dev am: 754656a669

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

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