Merge "Fix hwui compile error" am: 9bbcd6e1 am: b867bee3 am: 0580b4fd am: 8adc5867 am: af525a37

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



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