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

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



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