Merge "Improve the code of handleSessionLost()" am: 4c7e8dc8 am: 710d9416...

Merge "Improve the code of handleSessionLost()" am: 4c7e8dc8 am: 710d9416 am: aecc7695 am: 432c6e08 am: e9f2b336

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2114433



Change-Id: I8b8174bd28072a94455363df344601a0607a9c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>