am skip reason: Merged-In I40e1aa6377b8a60d91cb2f4189df1e9a4a4578a2 with SHA-1 1bc1be92 is already in history

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



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