Merge "Revert "Revert "Added mitigation for b/122921367""" am: fcd2235d8a am: ad135159b4

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

Change-Id: I2167d4cb6cd79741097284437acebcdfb6a9ffc2