Merge changes from topic "am-05f2065abd5e4046b081fdbbcbebf500" into...

Merge changes from topic "am-05f2065abd5e4046b081fdbbcbebf500" into tm-d1-dev-plus-aosp am: ceb4bcdc -s ours

am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566 is already in history

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



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