am 64c4e01e: am ff125cce: Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-dev

* commit '64c4e01e7d4c0257f074ad03e149474a4f19d086':
  Prevent duplicate OPP permission request dialogs