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 am: bf6c360f

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



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