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
Change-Id: Ib93edac934b6e2198ad56e058ca6007d8302ac8f