Merge "Fix build error from frameworks/base" into udc-dev am: fd7f9e4f

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



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