[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: 62476420 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iec1ff1e824a93da6932a9ca7f90cd1f2a0b27976