Merge changes from topic "am-6b5770e5b27947398b157c0326a15431" into udc-dev-plus-aosp am: 2791b3fe

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



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