Bug: 236346018 Test: manual test with Settings app Change-Id: I011957a321ad8c26743e72cc7ce825d06dab9167