Merge changes If2d87039,Ia544cbbf into udc-dev am: cadaf0c52e am: 78bfd565cf

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

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