Hide new non-standard APIs and permission

These were breaking builds due to the public API modification

Change-Id: I603fcf0601f40fb315086859aa03ef5b7ec39248
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2