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

Change-Id: I641310957b6c1ecaaef45f70532489f48acab91e