Merge "[BugFix][HWASAN] stack-buffer-overflow" am: 16335690d4 am: 2002e0a739 am: fec2dabce1

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

Change-Id: I851d8a89ccf2f6692b9a288d7578158b775cb6a3