Merge "Don't back up disabled apps" into oc-dev
am: 628690ea2b

Change-Id: If8008f3c14bdb12dee5e400ce96394e1f541f462