Merge "Fix a broken test by mocking PackageManager"
am: 9301bbf008

Change-Id: Iae564004657b004c0bb98381bb005a088a5735c9