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

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

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



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