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

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

Change-Id: Ida5ca72b70944d5df3af1321f5932811fef535b8