Add compatibility code with mainline's configuration options for unlock

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