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: 9cee90b7" into rvc-d1-dev-plus-aosp am: 068ed34b am: 9313c6d6
Change-Id: I2a2de03113ed6eca545478deb6ca8f59c166ba56