Merge "Should not clean mRemote when finishing latest merged transition" into...

Merge "Should not clean mRemote when finishing latest merged transition" into main am: d5035585 am: caab6fcd

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



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