Prevent stock OTA activities from running in CM

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