Merge "Merge "Be super safe" into rvc-dev am: f664b6d0d9 am: 9ad149eb5a am: a50d493ba0" into rvc-qpr-dev-plus-aosp am: 4f7b1a7c71

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

Change-Id: Ib7a059093f3922d4db47240baee2b15fab939270