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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9cbc5ee29e82a28d1a26d6d14e5c342c6d65136