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

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

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