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

* commit '528c64e205bf1d8f8237fb4e582d152958345b92':
  Repair broken keychain wifi_uid logic