[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: I30b183fc5dce963523aa65dcc75095e968d2b41a
This commit is contained in: