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