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

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

Change-Id: I18ac634d813417fafebb38dcbdd804a12c68ef88