Merge "Reland revert of "Added mitigation for b/122921367"""" am: 5be93c2823

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I427fc5166b5d5e29340a549f42626e1ac062d80f