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

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

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