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

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

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