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

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

Change-Id: I7441e753db8300075be2ebb75a36277d175fb584