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

Change-Id: I14f83f5f0891cc437a04306da1c51aaa0e096713