Merge "Toast app icon display is inconsistent for system apps" am: 822d1a86...

Merge "Toast app icon display is inconsistent for system apps" am: 822d1a86 am: 37e216ea am: 59444f38 am: ce81a9d7

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



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