Android 11.0.0 Release 38 (RQ3A.210605.005)
Remove new styles from AOSP am: f2971b3b02

Change-Id: I04e77d6b88be673f0ee919b29deaeae7a6ada926