Merge "Fix issue of TvInputManagerService not binding to TvInput services in Kids" into sc-dev am: afd8e9bb44

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15315830

Change-Id: I288e5f76b32842a0fe4c490c73534cd977ea0242

services/core/java/com/android/server/tv/TvInputManagerService.java

@@ -467,9 +467,9 @@ public final class TvInputManagerService extends SystemService {
     }
 
     private void startProfileLocked(int userId) {
+        mRunningProfiles.add(userId);
         buildTvInputListLocked(userId, null);
         buildTvContentRatingSystemListLocked(userId);
-        mRunningProfiles.add(userId);
     }
 
     private void switchUser(int userId) {