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: Ia50c3c558e675f95b76930c6bae62f7c653db3c3