[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix the inconsistency of...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix the inconsistency of protection level" into rvc-dev am: c9fc96e7 am: ccb1fef8 -s ours am: 2e684868 -s ours am: 536b639b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2df89c74f1e40c980b7e87d3da797281c82da3b4