[automerger skipped] RESTRICT AUTOMERGE am: 929ab61a14 -s ours am: 15a769dbc3 -s ours am: 20171d27de am: c1874ee282 -s ours am: 979db2c120 am: 2d1fe072f3

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

Change-Id: Iacfb005dd955f32c126609e55afd54b8b5843c3d