Merge "Be super safe" into rvc-dev am: f664b6d0d9 am: e43101944b am: 35e33905d3 am: 4e37a4212d

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

Change-Id: I851aaaffbb629671f3a8303fb605c0b424fb0a48