[automerger skipped] RESTRICT AUTOMERGE am: 79062d7903 -s ours am: 6f14b9586d -s ours am: 6f46168580 am: 7306f907e4 -s ours am: c83a8122e4

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

Change-Id: If4e1f42f1b44f076ef5df3471bdd6ac62a7017a2