[automerger skipped] Merge changes from topic "am-81c620851fa141aaa28dc766c861df78" into udc-dev am: 9007d0a7 -s ours am: 5b9381d4 -s ours

am skip reason: Merged-In If0db995ffaf4866bbadc828a0ade37a10da91553 with SHA-1 88fbe863 is already in history

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



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