Merge "Keep media sessions for stopping user until the stopping is completed...
Merge "Keep media sessions for stopping user until the stopping is completed am: f2811097 am: c3d57f02 am: 50e1f45b am: e14dd68e" into rvc-qpr-dev-plus-aosp am: 966833d5
Change-Id: Ib7b48bf466d71094bf29b726011add3f9365def6