Merge changes from topic "am-3b102dd47eed4764b23192ba3873ed95" into udc-dev am: 241444b4 am: e579f302 am: c4acfaa4 am: 832dd821

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



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