Merge "Follow-up to Ifb322f9603aad841b4947038574d5d1a42d3dc10" into udc-dev am: 100eaf66 am: 9dfc2ffd

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



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