tree 93b912ae2ff899e263f50d50a0df66f8913e1874
parent d9562badeaf36471a09c3ab77fc20bf4b67b3401
parent 03f25cb0d217f27a203f7a1da22abc1de631b644
author Jackal Guo <jackalguo@google.com> 1641956570 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641956570 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ibbf1de6c1f9c35e33a4c7c43d16f5bca5ce3f5ee