Merge "Keep members needed for downstream weak refs" into main am: e380004d am: db8a61da

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



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