Merge "Merge "Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev am: d239223cb0" into oc-dev-plus-aosp am: e0e827d5c0"