[automerger skipped] Merge "Remove unnecessary dependency on...

[automerger skipped] Merge "Remove unnecessary dependency on libnativehelper.so" am: 82a8c40f am: 18b34ba7 am: 2204759b -s ours

am skip reason: Change-Id I3a9f277d27e69b0ff6e9c29c3e2a8a6a7179b9a9 with SHA-1 e53587b4 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1594053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6021a1d69cea01e11fed158418a2a185bdc9e068