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

am skip reason: subject contains skip directive

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



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