Merge changes from topic "am-3a8c44cad77b4776b97ef35c53ba858a" into udc-dev am: 4638478f am: 6a88e959

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



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