[automerger skipped] RESTRICT AUTOMERGE am: 5f12deecd4 am: 0b29810efa -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68128c603378f77137a66f9b5f25ef2980c98ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>