Merge "Revert "Resolve session linger caused by RemoteFillService."" into...

Merge "Revert "Resolve session linger caused by RemoteFillService."" into udc-qpr-dev am: 3c7606f3 am: c3a9a52f

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



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