Merge "Hide apks not needed for a specific sku" into pi-dev
am: 776b4e2dfa

Change-Id: I1219ddda2808492d84e182c4192e4caee27ba297