Merge "Fix CTS CrossProfileAppsHostSideTest related to multi-user" into pie-cts-dev
am: 7b1a3ed49a

Change-Id: Id8759d39d160aeae9397f0f8b12a755c0ba5f780