[automerger skipped] [RESTRICT AUTOMERGE] Fix the inconsistency of protection level am: b5efdf7293 am: c1826ef1b4 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16531386 Change-Id: I59c09e837f149088215f515c249ecc5ca452236f
This commit is contained in: