Merge changes from topic "aosp-nnapi-burst-compat-lib" am: 593f0ecaf4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1640843

Change-Id: I892a18e83e3f68f59ec3c9d3343ceb2d90e86903