Merge "DO NOT MERGE: Dynamic doze check should be required before adjusting...

Merge "DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate. am: 1f3da1c8  -s ours am: c7088d8b  -s ours am: ef6e002b am: 44bdde7b" into oc-mr1-dev
am: fc696366

Change-Id: I830f27d6951fbe5ea880caf828838b3644656670