am d6fc5115: Merge "DO NOT MERGE Hide leanback packagemanager apis." into klp-modular-dev

* commit 'd6fc5115a656f9d06dd1d455f8bedd5f5eca943b':
  DO NOT MERGE Hide leanback packagemanager apis.

core/java/android/app/ApplicationPackageManager.java

@@ -128,6 +128,7 @@ final class ApplicationPackageManager extends PackageManager {
         return intent;
     }
 
+    /** @hide */
     @Override
     public Intent getLeanbackLaunchIntentForPackage(String packageName) {
         // Try to find a main leanback_launcher activity.

core/java/android/content/pm/PackageManager.java

@@ -1264,6 +1264,7 @@ public abstract class PackageManager {
      * typically used in a living room television experience, but is a software
      * feature unlike {@link #FEATURE_TELEVISION}. Devices running with this
      * feature will use resources associated with the "television" UI mode.
+     * @hide
      */
     @SdkConstant(SdkConstantType.FEATURE)
     public static final String FEATURE_LEANBACK = "android.software.leanback";
@@ -1299,9 +1300,7 @@ public abstract class PackageManager {
      * room television experience: displayed on a big screen, where the user
      * is sitting far away from it, and the dominant form of input will be
      * something like a DPAD, not through touch or mouse.
-     * @deprecated use {@link #FEATURE_LEANBACK} instead.
      */
-    @Deprecated
     @SdkConstant(SdkConstantType.FEATURE)
     public static final String FEATURE_TELEVISION = "android.hardware.type.television";
 
@@ -1491,7 +1490,7 @@ public abstract class PackageManager {
     public abstract Intent getLaunchIntentForPackage(String packageName);
 
     /**
-     * Return a "good" intent to launch a front-door Leanback activity in a
+     * @hide Return a "good" intent to launch a front-door Leanback activity in a
      * package, for use for example to implement an "open" button when browsing
      * through packages. The current implementation will look for a main
      * activity in the category {@link Intent#CATEGORY_LEANBACK_LAUNCHER}, or