[automerger skipped] RESTRICT AUTOMERGE am: 79062d7903 -s ours am: 6f14b9586d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8fa37808957a4f8d5d161902fe1c7b7d39fc3143