am 528c64e2: Merge "Repair broken keychain wifi_uid logic" into lmp-mr1-dev
automerge: d16231d

* commit 'd16231de248aeb5aeccb8f4aa226a2f1b34cc082':
  Repair broken keychain wifi_uid logic