[automerger skipped] Correct protectionToString am: 379eb5c25f am: 53bed2c790 am: 6893cb04b7 -s ours

am skip reason: Change-Id Ifa9099541df1c287e5883a801ed14d34dad6287b with SHA-1 1fbb8a68d4 is in history

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

Change-Id: I7f7b5717810823edd7462a4bf4766266dcf37905