Merge changes from topic "am-3b102dd47eed4764b23192ba3873ed95" into udc-dev...

Merge changes from topic "am-3b102dd47eed4764b23192ba3873ed95" into udc-dev am: 241444b4 am: 51fbea68 am: 235f9da3 am: 367e616a

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



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