[automerger skipped] DO NOT MERGE am: e9ec3227 -s ours am: e3b2d76c -s ours

am skip reason: subject contains skip directive

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



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