[automerger skipped] RESTRICT AUTOMERGE am: c99b04eb -s ours am: 31d35297...

[automerger skipped] RESTRICT AUTOMERGE am: c99b04eb -s ours am: 31d35297 am: b4d16b75 -s ours am: 0b8cc335 am: d4304422 am: 0eb14db5 am: 9de95d66 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9d33058826d25534ef06a2af288fb4ad0ddec9ad