Merge "Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am: 90a6054805 am: 94b497bccc am: 27918e7ff1" into oc-dev-plus-aosp