Bug: 234570979 Test: make Settings app Change-Id: I23d5a3dc27fe5df5ba45b8593c9f2ad3d7c25cbc
c99fa169ca