Merge "Merge "Revert "Added mitigation for b/122921367"" am: 8ffbbc69 am: 3d548ec5 am: dadf0a52" into rvc-qpr-dev-plus-aosp