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

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



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