am 386c4e9e: Merge "Fix testSaw_ungrantedUid_Bluetooth"

* commit '386c4e9ea976377d87950427472a593c22b1b205':
  Fix testSaw_ungrantedUid_Bluetooth