Merge ": disable suspend while off due to prox and 560 dpi" into cm-11.0

Change-Id: I3b53865eeefb97b6d5221acfce623486a9962a62