[automerger skipped] [RESTRICT AUTOMERGE] Fix the inconsistency of protection level am: b5efdf7293 am: c1826ef1b4 -s ours am: 6d3ad47c2d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id53bdb671f27b22a5b542d763d3e7701cef582eb