Merge "Fix hwui compile error" am: 9bbcd6e11e

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

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