Merge "Merge "Changes to MbmsStreamingManager for test app" am: df57734354 am: 244912f414" into nyc-mr2-dev-plus-aosp
am: fd27f0f9ab

Change-Id: I6ee8bd52b2bdfa13b58746b060c1d88eb7a47ab8