Merge "Refine keep rules for Java classes w/ native methods" am: 170a9aba am: 38f2d286

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



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