am b1cebd9e: am 5579e41c: Add op package to the UID special case handling in account manager.

* commit 'b1cebd9ecf2ee3542e815f7f7efc1cb7fd6e6228':
  Add op package to the UID special case handling in account manager.