Bug: 236636175 Test: m RunBackupEncryptionRoboTests Test: m RunBackupEncryptionIntegRoboTests Test: m RunSettingsRoboTests Test: m RunSettingsLibRoboTests Change-Id: I0e301b641312f8cc4a235df5ec62acf1446cbb64 (cherry picked from commit58ddd21982) Merged-In: I0e301b641312f8cc4a235df5ec62acf1446cbb64 (cherry picked from commit86203882dd) Merged-In: I0e301b641312f8cc4a235df5ec62acf1446cbb64