[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: 6b5b8cd0 -s ours am: 94c78071 -s ours am: c4dff768 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3afda222b7089e862928d69c2811f100c045a157