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

Change-Id: I3fe46bf58306211ca49557a8fc2131caf902b2cf