[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L82300000954861163:N42000001270135524" into tm-mainline-prod am: d6864b06 -s ours

am skip reason: Merged-In I304bff8f34c3d4d9e00be31c9aa3c40c63cd0dd0 with SHA-1 bcd6a7d7 is already in history

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



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