Bug: 234570979 Test: Manually with Settings App Change-Id: I4cd66be1df5499c070fd7f80caf9a5ab2873b93d
Bug: 129352433 Test: manually Change-Id: I00cf2e5e7e8a9ebd60d9aa4e9047c9cd04ec16c7
Bug: 129352433 Change-Id: I3c9594f9ed49208ef1d7bbc33e8083a0c733b1f8 Test: manually confirmed it works and looks correct (cherry picked from commit fdeb07c05b)
fdeb07c05b