tree 8e292e44473bdb43c1bfead99eb3ea816c9e997d
parent 6d3ad47c2dccd0434746d226c30d25a45bc0952c
parent 6b5b8cd03bd3a05ba92518fb89600c998ccd1c0e
author Jackal Guo <jackalguo@google.com> 1641954257 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641954257 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix the inconsistency of protection level" into rvc-dev am: c9fc96e7b4 am: 6b5b8cd03b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I83320d1cbeb7c0245caec8fd2ffd88ff00fb9446