Merge "Keep members that are weakly referenced from native code" into main am:...

Merge "Keep members that are weakly referenced from native code" into main am: 0928b907 am: 1dd9eb59

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



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