Placeholder change for revert

Placeholder cl to revert ag/16684151 on AOSP. This change
should be for SC QPR2 branch only. T should have a different
fix.

Bug: 211682727
Test: None
Change-Id: I5211c499628dc0d027669ed5a0e52a9091084a89