[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319...

[automerger skipped] RESTRICT AUTOMERGE am: 6a5777dd -s ours am: 80d04319 -s ours am: 4a510d0f am: 3f1fb650 -s ours am: 6766245f am: e0fe6407

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a0c048cbfd3c2cd91c59413d336d7a5d88a2522