Merge changes from topic "am-878ea9668b274b6ba95050fbf51252cf" into qt-dev-plus-aosp

* changes:
  Merge changes from topic "nnapi_ext_restrict" am: aef149ecde am: 52d97c1b5a
  [automerger skipped] Add getLocationFlags getter to PackageManagerNative. am: 02d8a7c57d am: 1d03d08556 -s ours am skip reason: change_id I0b3a5a4f3559b2d1d44088c8fa1d5bb5605c83cb with SHA1 a4a631ea6f is in history