Merge "Don't run obb backup for shared storage backup package." into pi-dev
am: 494113e74a

Change-Id: I5eea028f21a2a91c94855255cb25607f81324b73