Merge "Revert "Added mitigation for b/122921367"" am: 8ffbbc6939

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

Change-Id: If719d2077833e997337c1631fbfc55e920c49cc0