Merge "Merge "Changes to MbmsStreamingManager for test app" am: df577343 am: 244912f4" into nyc-mr2-dev-plus-aosp