[automerger skipped] RESTRICT AUTOMERGE am: 792a8bd3f4 -s ours am: bee41d9fda -s ours am: 09106820f3 -s ours am: 528064ade7 -s ours am: 304441aad6 -s ours am: d4d1635528 -s ours am: b854b8690e -s ours

am skip reason: subject contains skip directive

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

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