[automerger skipped] RESTRICT AUTOMERGE am: e05538421f am: 28921fe615 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I14a1705b8be1de18181e4370b007d6fed7acdcb2