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

am skip reason: subject contains skip directive

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

Change-Id: I737d3743b7b1bcaf3c99d5f0522b7b571810d18e