Add imagecatalog user to main and ml
Bug: T287130 Change-Id: I8c8e17bbeb5a0033fd2547be6ba904bb6dd83444