[automerger skipped] RESTRICT AUTOMERGE am: e0553842 am: 28921fe6 -s ours...

[automerger skipped] RESTRICT AUTOMERGE am: e0553842 am: 28921fe6 -s ours am: 9ab0bce3 am: ca804e46 am: 4274fa4d am: 8f24cb26 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I44ae42045f2adeed63cb8b1d4b1f56453af2e009