Merge "DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate. am: 1f3da1c8b9  -s ours am: c7088d8bf8  -s ours am: ef6e002b30 am: 44bdde7bd1" into oc-mr1-dev am: fc696366b5
am: 41c7c711f4  -s ours

Change-Id: I60250b6b0d0905f3ff5381f7c67db2184bfe58c0