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

[automerger skipped] [RESTRICT AUTOMERGE] Fix the inconsistency of protection level am: b5efdf72 am: 3142a08e -s ours am: 24dbab1a -s ours am: ba1c351e -s ours am: 2ec3346e -s ours am: 6dd1e263 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I419fb4c276455ebd33f1a21ce79f1204183fb23e