[automerger skipped] [RESTRICT AUTOMERGE] Fix the inconsistency of protection level am: b5efdf72 am: c1826ef1 -s ours am: 6d3ad47c -s ours am: 5c3a0427 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I422e6104343300368278b2bc178c41d7b317fcba