[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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16531386 Change-Id: I82eeaf435702c626bc5f519e81412b4c1d184565
This commit is contained in: