[automerger skipped] RESTRICT AUTOMERGE am: 681b2364 -s ours am: 5daea910...

[automerger skipped] RESTRICT AUTOMERGE am: 681b2364 -s ours am: 5daea910 am: 83fac841 -s ours am: bb5558fe am: 938fb7e8 am: 987c2978 am: 44730496 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I028d2cd49590d36dd64c74242b13eda7d695922a