Merge "Trivial fix forward for build breakage" into udc-qpr-dev am: 0113e001 am: 87e1d284

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



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