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

Change-Id: I7a352def470a54916129fb9fc90239658847a02f