Merge "Add libneuralnetworks_shim.so to requireLibs." am: d7fd9b715c am: cddf730f37 am: a9689e9e3a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1675827

Change-Id: I262c059d40f48cb5bc1bcfa1741bf73ab407cc58