Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp
am: b91a596c9b

Change-Id: I7b21ffc84d7c53ae68ae3ca61b3bcca107df141d