[automerger skipped] Merge "Update SettingsRoboTests for truth 0.42" am: 1e342c5b
am: 2df12ab3 -s ours
am skip reason: change_id I32cb2fcf6094675f79d2fc24702ef6298a9691e4 with SHA1 cdf284b7 is in history
Change-Id: I4a0e8480124ad9d96ba3be26faf41cfe80b1c047