am 84bc5618: Merge "Show account icons for managed profiles on Settings >...
am 84bc5618: Merge "Show account icons for managed profiles on Settings > Factory Reset" into lmp-mr1-dev
* commit '84bc5618':
Show account icons for managed profiles on Settings > Factory Reset