Merge "Update logic for toast app icons" into sc-dev am: 4499b71b am: 8b872a7a am: 269c2abb

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

Change-Id: I89d1d906c6ded3412d18e835909820f3173111d1