Merge "NNAPI property to disable extensions use on GSI/AOSP product partition."
am: d385346ada

Change-Id: I9afa8f205fca303d1451f89cff81d4e9dcfe0784