Fix google app install

Change-Id: I6619e215fd359de78b5d643e2c8b7b97436bd3a7

Conflicts:
	services/java/com/android/server/pm/PackageManagerService.java