Make Proxomity wake setting opt-in

Change-Id: I8a77c6e514a2342c8bb21a5bf59c46e23966383f