Merge "Follow-up to Ifb322f9603aad841b4947038574d5d1a42d3dc10" into udc-dev am: 100eaf66 am: a39bf6ba am: 714812f4

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



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