[automerger skipped] RESTRICT AUTOMERGE am: c99b04ebad -s ours am: 31d35297fd am: b4d16b75b6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie6f46c80b2778aee6e9a3263d4811d6c7502512c