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

Change-Id: If496a76fc79f0f402e8a0c509f1d370903ab535a