[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: d6a48bb7f6 -s ours

am skip reason: subject contains skip directive

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

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