Merge changes Icb7ba7d1,If6d5e6ec into udc-dev am: 8b616a88 am: 6c25ead8 am: 4263735c am: d9734545

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



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