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

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



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