Merge "Fixing test failure on hwasan builds" am: 855810c4 am: 6407abc8 am:...

Merge "Fixing test failure on hwasan builds" am: 855810c4 am: 6407abc8 am: 169df0ca am: d0923675 am: 9475ff4e am: c9fec87d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2592945



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