Merge "Follow-up to Ifb322f9603aad841b4947038574d5d1a42d3dc10" into udc-dev...

Merge "Follow-up to Ifb322f9603aad841b4947038574d5d1a42d3dc10" into udc-dev am: 100eaf66 am: b5ff652f am: 14a3f763 am: 5ad7c4e3

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



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