DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate. am: 1f3da1c8b9  -s ours
am: c7088d8bf8  -s ours

Change-Id: I6cbd05dcb09b013e17f5c26c1fa24a656c7b8316