[automerger skipped] Merge "Prevent NPE when checking toast icon label" into...

[automerger skipped] Merge "Prevent NPE when checking toast icon label" into sc-v2-dev am: 8db70a36 am: 25547b7e -s ours

am skip reason: Merged-In I8eb15dcb6ab71c5f3e91a7dae08adaaaa5e60ab2 with SHA-1 aeacd49f is already in history

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

Change-Id: Ic12309b11f288ea0685e61ebaf21704072a55396