[automerger skipped] [RESTRICT AUTOMERGE] Fix the inconsistency of protection level am: b5efdf7293 am: 3142a08ea6 -s ours am: 24dbab1a54 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id3fb0ca272226b3041be8bc43190f663c785acb4