Snap for 8570526 from 7f3f4edc7332f27acb3803a2d295fdce1386b9d4 to mainline-ipsec-release

Change-Id: I37885b8fab067a3b39f35dbb9655865dec4933bc
diff --git a/Android.bp b/Android.bp
index e33d97e..9fae49d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,9 +1,28 @@
+package {
+    default_applicable_licenses: ["packages_inputmethods_LeanbackIME_license"],
+}
+
+// Added automatically by a large-scale-change
+// http://go/android-license-faq
+license {
+    name: "packages_inputmethods_LeanbackIME_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 version_name = "1.00-aosp"
 version_code = "100"
 
 android_app {
     name: "LeanbackIME",
 
+    product_specific: true,
+
     sdk_version: "system_current",
 
     srcs: [
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c7267cd..d1e42c5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,28 +16,26 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.inputmethod.leanback" >
+     package="com.android.inputmethod.leanback">
 
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
 
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="23" />
+    <uses-sdk android:minSdkVersion="16"
+         android:targetSdkVersion="23"/>
 
-    <application
-        android:label="@string/ime_name" >
-        <service
-            android:name="com.android.inputmethod.leanback.service.LeanbackImeService"
-            android:label="@string/ime_service_name"
-            android:permission="android.permission.BIND_INPUT_METHOD" >
+    <application android:label="@string/ime_name"
+        android:directBootAware="true" >
+        <service android:name="com.android.inputmethod.leanback.service.LeanbackImeService"
+             android:label="@string/ime_service_name"
+             android:permission="android.permission.BIND_INPUT_METHOD"
+             android:exported="true">
             <intent-filter>
-                <action android:name="android.view.InputMethod" />
+                <action android:name="android.view.InputMethod"/>
             </intent-filter>
 
-            <meta-data
-                android:name="android.view.im"
-                android:resource="@xml/method" />
+            <meta-data android:name="android.view.im"
+                 android:resource="@xml/method"/>
         </service>
     </application>