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

Change-Id: Ibbb8403bdf68d6a55b67ee361b578e2aa767bb42