Merge "Share one receiver for CurrentUserTracker" am: 06d619ccfa
am: a84c7ea396

Change-Id: I54ca8022b6aeb15329d7a432300eaa758ea4b8ac