Merge "Revert "Revert "Added mitigation for b/122921367""" am: fcd2235d8a am: ad135159b4 am: 390cca1808 am: 3f908c7afb

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

Change-Id: I62fac79f1279c984d4762ffd75bdbebd4ca3542e