[automerger skipped] Merge "[Passpoint] Changes to Unique ID" into rvc-qpr-dev am: c6cf6ba1ab am: 1ab937cc58 -s ours

am skip reason: Change-Id Ice11158078b5b86c721747b0d67ecfb09731a3c5 with SHA-1 59bfebaa10 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12364462

Change-Id: Ief90571030046f34cd5e84f64f74a350c556ea7b
tree: 674e219f484574066a53654e5ca2417252a15e91
  1. framework/
  2. OsuLogin/
  3. OWNERS