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

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

Change-Id: I70a7465732f1db92900253acaacf3d6c6173a660