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

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

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