Merge "Be super safe" into rvc-dev am: f664b6d0d9 am: 9ad149eb5a am: bb423fee7a am: 65d63b7b52

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

Change-Id: I1de2eaf10635a459e95e60956cefa1a4eb2d08f7