Merge "Be super safe" into rvc-dev am: f664b6d0d9 am: 9ad149eb5a am: a50d493ba0

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

Change-Id: Idc16b22c51aeddcc881372d328f153a14dd3cfdb