Merge changes from topic "am-5e4f3119099c4423b7ccf4fd14920428" into udc-dev...

Merge changes from topic "am-5e4f3119099c4423b7ccf4fd14920428" into udc-dev am: 50ff7b83 am: 7fcb3828

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



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