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

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

Change-Id: I32e5a8cae9f0da29b3345510cae8f52815896759