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

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

Change-Id: Ie81c4e74a27fc899b13554748337b33f059d5b81