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