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

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

Change-Id: Ia24173d35e7af6801df870781e6faf05d0c433bf