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

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



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