Update settings

Bug: 109890761,73736474,73737524,73773935,79701706
Test: Unit Test
PiperOrigin-RevId: 201379249
Change-Id: I0a18adc4c8df33c65e81281928508897679b5994
2 files changed