Merge "Do not scan system apps unless after OTA" into nyc-mr1-dev
am: 85c10342c1

Change-Id: Ic40a7b4c794029861ae1a1608c3022b9577e02c5