[automerger skipped] [RESTRICT AUTOMERGE] Fix the inconsistency of protection level am: b5efdf72 am: 3142a08e -s ours

am skip reason: subject contains skip directive

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

Change-Id: If4dc703efd1a9d49801745c0a95d7aeda41bfcbd