[automerger skipped] Merge "Add explicit dependencies on jni_headers" into...

[automerger skipped] Merge "Add explicit dependencies on jni_headers" into rvc-dev-plus-aosp am: e223b523 am: 05ef516b am: 4d4a0241 -s ours

am skip reason: Change-Id I7e7a0df96249fad3eb07977b87ae7953c4b22b5f with SHA-1 b9b2b7a4 is in history

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

Change-Id: Ia63074d0884b9d6e43ac534228e52922a5164b3b