Merge "Fix hwui compile error" am: 9bbcd6e11e am: b867bee3da am: 0580b4fdf1 am: 8adc586787

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

Change-Id: I44ca32a4dc2205b9a9833932d252760a3f454f71
Signed-off-by: Automerger Merge Worker <[email protected]>