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

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

Change-Id: I3da44f1167fc6d233ba0ef2c8935184f27fd0cf1