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

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

Change-Id: Id8d281a9c21bbae441298c074e80d361d4749956