Merge cherrypicks of ['googleplex-android-review.googlesource.com/32673349'] into 25Q2-release.

Change-Id: I50a4db406f65670e0f59baee7d5471bb09423139
diff --git a/tv/input/aidl/vts/functional/Android.bp b/tv/input/aidl/vts/functional/Android.bp
index c472e24..dfbec0a 100644
--- a/tv/input/aidl/vts/functional/Android.bp
+++ b/tv/input/aidl/vts/functional/Android.bp
@@ -23,6 +23,7 @@
         "android.media.audio.common.types-V1-ndk",
         "android.hardware.common-V2-ndk",
         "libaidlcommonsupport",
+        "android.hardware.tv.input-V2-ndk",
     ],
     test_suites: [
         "general-tests",
@@ -33,7 +34,6 @@
         "libvndksupport",
         "libfmq",
         "android.hardware.common.fmq-V1-ndk",
-        "android.hardware.tv.input-V2-ndk",
     ],
     require_root: true,
 }