Merge "Don't bring up backup agents in secondary app processes" into oc-dev
am: 67db70adf1

Change-Id: I4a82af26fa61f25f254ae6f4441160ac6cc4a873