Merge changes from topic "nscobie-hwui_unit_tests" am: 463a012834

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

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