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

Change-Id: I97389ba178bf6a225c375d27d91655e9957bbbf5