Merge changes I7cc11e08,Ia2afd2e4 into udc-dev am: a940068d am: 83b45520...

Merge changes I7cc11e08,Ia2afd2e4 into udc-dev am: a940068d am: 83b45520 am: efdbbb93 am: 551c8b7d

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



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