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

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

Change-Id: I69d84af2e863e7f8d00a2ce379f3399799b5776c