Merge changes from topic "am-3a8c44cad77b4776b97ef35c53ba858a" into udc-dev am: 4638478f am: 2a387e83 am: aa92b5a4

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



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