Merge "Expose ScanResult#untrusted as a @SystemApi." am: a93e57f1ac am: a3943850ab am: 471093b58e
am: 9926363b09  -s ours

Change-Id: I2bb1214df6132f414214241f8e91d9c4b95d7c9a