Merge "fix RemoteView's content loss in some case" into main am: 7257a7e73d

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

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