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

am skip reason: subject contains skip directive

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

Change-Id: I32060283f629e229da1dbed02ffc5fc799438306