[automerger skipped] RESTRICT AUTOMERGE am: 5f12deecd4 am: 0b29810efa -s ours am: c24ce12bbe -s ours am: c94352e325 -s ours am: 944a0d9ded -s ours am: 5e5e9db28b -s ours am: b5aeeec9ce -s ours am: 5859c364fb -s ours

am skip reason: subject contains skip directive

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

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