[automerger skipped] RESTRICT AUTOMERGE am: 929ab61a -s ours am: 15a769db...

[automerger skipped] RESTRICT AUTOMERGE am: 929ab61a -s ours am: 15a769db -s ours am: 20171d27 am: c1874ee2 -s ours am: 979db2c1 am: 6b99b593 am: 3282d334 am: 151bffbe -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icf136b393f7d6ee72f35b31205bcd9672a7d57b1