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

am skip reason: subject contains skip directive

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

Change-Id: Ic6430aa8cec7406ed69b34e64137b97a83a3a94c