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

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

Change-Id: Id93c5bcffc8b97a224650fb184364deba7c6edbc