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

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



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