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

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

Change-Id: I3722d02a6e74ca432461c721646f7e965065e304