This reverts commit3cd311415b. Reason for revert: The CL causes the regression b/170474494 And it also makes status bar color incorrect while FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS is cleared Fix: 170474494 Change-Id: I26bed08456197721d07f2fab563be0c54e43efd2 (cherry picked from commit427bdc1c86)