Protected Apps: Remove protected folder if there are no entries

Change-Id: I942cd6b3753ebd932bdd3162b30db5b4fb45e536
Protected Apps: Re-add filtering in App Drawer and fixing protected folders

Change-Id: Ia0899f79248647dbacf44cf917a27ebe62d20e4d