Bug: 34204146 Test: RunSettingsRoboTests Test: compile framework Change-Id: I1c462cda4c3a1973ac05de300231b0939dba0b3c