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

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



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