Merge changes from topic "toast-security-fix-sc-dev" into sc-dev am: 799f0a7f

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

Change-Id: I44df933c6e2e65cf44f4f1215f51d543491b8d1a