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

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

Change-Id: I16bc9cfe41fd6be8b90a1caaeeeb0c84bcac6e26