Merge "Fixing test failure on hwasan builds" am: 855810c4e9

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

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