Merge changes from topic "am-afef51d7c087450aa0e97e56dfd2dd4c" into udc-d1-dev am: 54d8d129 am: 058463ed

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



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