Protected Apps: Remove protected folder if there are no entries

Change-Id: I942cd6b3753ebd932bdd3162b30db5b4fb45e536
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0