am f6c8169a: am 26d8d1d5: Merge "Fix singleUser provider grants" into lmp-mr1-dev automerge: 775d104

* commit 'f6c8169a684183d5149fc7d41b92adbb1700dab5':
  Fix singleUser provider grants