Fix compile time error with Protected Apps

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