Merge "Add the CorePerfTests and MultiUserPerfTests to APCT metrics" into pi-dev am: 879240cc38
am: 990799803b

Change-Id: I7b9dc58554edde1b4c6c43d5eb02cbf0ad14d6d2