Re-enable proximity wake option

Change-Id: Iacdb788c5e76ad118f07fc6ab88e33f0db62bbc9