Merge changes from topic "aosp-nnapi-burst-compat-lib" am: 593f0eca am: 226d3a68 am: 01d802c7

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

Change-Id: Icf3e133e485f602da745f601c6196f6a4c04f9e9