Merge "Hide app if it shares uid with whitelisted app" into pi-dev am: 8aab7c65ec
am: 954de01816

Change-Id: I32b2b8fd95effc52c62fe11504ad93b918f8d3f3