[automerger skipped] DO NOT MERGE am: 3f218c9a5e am: e0243c7661 -s ours

am skip reason: subject contains skip directive

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

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