Merge "Merge "Be super safe" into rvc-dev am: f664b6d0 am: 9ad149eb am:...

Merge "Merge "Be super safe" into rvc-dev am: f664b6d0 am: 9ad149eb am: a50d493b" into rvc-qpr-dev-plus-aosp am: 4f7b1a7c

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

Change-Id: Ib7a059093f3922d4db47240baee2b15fab939270