Merge "Properly check for secondary user ServiceInfo" into main