Removed screen on/off callbacks from NPMS. am: f8dd7b4e8d am: 6a3706a08c
am: bb10d26ba6  -s ours

Change-Id: If05444434b274c93d102ea46625e45a7498c8e2a