[automerger skipped] libhidl: check ro.debuggable less am: 59af9c82dc am: fd1192bbfd -s ours am: 3f582135d2 -s ours am: ea9ca66b5f -s ours

am skip reason: Merged-In I6df328dead00c05dcbd8eedf63fc24a8d6141871 with SHA-1 3b6a233eba is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libhidl/+/21105968

Change-Id: I3df924f15385dab0eaeefcd845074333be477b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 670ee39..b694886 100644
--- a/Android.bp
+++ b/Android.bp
@@ -112,9 +112,6 @@
     ],
     min_sdk_version: "29",
     afdo: true,
-    header_abi_checker: {
-        diff_flags: ["-allow-adding-removing-weak-symbols"],
-    },
 }
 
 // WARNING: deprecated
diff --git a/vintfdata/manifest.xml b/vintfdata/manifest.xml
index b3d84aa..b93205c 100644
--- a/vintfdata/manifest.xml
+++ b/vintfdata/manifest.xml
@@ -54,7 +54,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
+    <hal format="hidl" max-level="7">
         <name>android.system.wifi.keystore</name>
         <transport>hwbinder</transport>
         <version>1.0</version>