Proximity : Check proximity flags only if from native

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