Merge changes Ie6015f71,Ib14d60c0 into udc-dev am: 2cdde680 am: fc212f23 am: 57b7ec11

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



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