[automerger skipped] [RESTRICT AUTOMERGE] Fix the inconsistency of protection...

[automerger skipped] [RESTRICT AUTOMERGE] Fix the inconsistency of protection level am: b5efdf72 am: c1826ef1 -s ours am: 6d3ad47c -s ours am: 46ace1dc -s ours am: d9562bad -s ours am: 86ae6fbc -s ours

am skip reason: subject contains skip directive

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

Change-Id: I966fd4f158e5c27f1529306c70d773405a745194