[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix the inconsistency of protection level" into rvc-dev am: c9fc96e7b4 am: ccb1fef85d -s ours am: 2e68486822 -s ours am: 536b639b48 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I18a221ea2ecd5bf5e4d30f2940e4a06766aa93cf