Merge "Teach PinnerService to pin parts of APKs" into pi-dev am: e54efcef6b
am: fb68f38885

Change-Id: I182957476228041792eba63a1694f92dc2524bc6