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

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

Change-Id: I968858be27bc923d9669d110050705f719c9c6cc