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