Merge "DozeScrimController: Fix tight-posting bug" into oc-mr1-dev am: f8cb5482c8
am: 8529200aa3

Change-Id: Icc9fcfd77cb389d0afe338e8d8a8938f80adf497