[automerger skipped] RESTRICT AUTOMERGE am: 929ab61a14 -s ours am: 15a769dbc3 -s ours am: 20171d27de am: c1874ee282 -s ours am: 979db2c120 am: 6b99b593b1 am: 3282d334c5 am: 151bffbe42 -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