Merge "Merge "Revert "Added mitigation for b/122921367"" am: 8ffbbc6939 am: 3d548ec500 am: dadf0a52aa" into rvc-qpr-dev-plus-aosp