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

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



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