Merge "Merge "Correct scope of "disabled?" check viz backup/restore decisions"...
Merge "Merge "Correct scope of "disabled?" check viz backup/restore decisions" into oc-dev am: d239223c" into oc-dev-plus-aosp
am: e0e827d5
Change-Id: I06fadd7da7d35e8c89d582c23296f4720e20b348