Merge "Merge "Don't reject notifications and wait until new addressed player...
Merge "Merge "Don't reject notifications and wait until new addressed player is ready (1/2)" into oc-dr1-dev am: a8c7ddb9 -s ours am: ea5b4f43 -s ours" into oc-mr1-dev-plus-aosp