Merge "IServiceManager: use constant expressions"
am: dbaed0ac91

Change-Id: If2b00e82d6c06853be8ffccc1bebb47e30fbcc7d