Merge "Fix hwui compile error" am: 9bbcd6e11e am: b867bee3da

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

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