Merge changes I3460e27e,Ib2f1d194,I28b8f266 into udc-dev am: fbd5595517

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

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