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

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



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