Merge "Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev am: 7a5dd1c3ff am: 51a89ee90c am: 102b9e5968" into oc-dev-plus-aosp