Merge changes from topic "am-690a757853224cf3afc67ab6aa353037" into udc-dev...

Merge changes from topic "am-690a757853224cf3afc67ab6aa353037" into udc-dev am: a8e64208 am: 339fdc31

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



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