Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp
am: 60ec77baf9

Change-Id: Id578e3661709d57cee33484671e66dbe8b23f687