This reverts commit9449cfc4a6. This reverts commit22fa97577f. This reverts commitbde48202e7. Bug: 141649119 Bug: 143195895 is also fixed on my taimen with the above. Bug: 143185828 Test: atest SystemUITests Change-Id: I225b10fef2f88d3436ef3a683c09717467b071ad