Merge "Fix a broken test by mocking PackageManager" am: 9301bbf008 am: 47cb8217b1
am: 64bf5c6221

Change-Id: If341a0f55ef904154f512bf526cc7b092d3f6b06