[automerger skipped] RESTRICT AUTOMERGE am: 929ab61a -s ours am: 15a769db -s ours am: 20171d27 am: c1874ee2 -s ours am: 979db2c1 am: 2d1fe072 am: c15a98b4 am: afc4507c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I18300b62a6f4f5dba1bd501c348885bf4455c7a4