Merge "VintfObject: add getTargetFcmVersion"

diff --cc core/java/android/os/VintfObject.java
index 12a495b,951cbf5..fb22194
--- 1/core/java/android/os/VintfObject.java
--- 2/core/java/android/os/VintfObject.java
+++ b/core/java/android/os/VintfObject.java
@@@ -76,8 -76,15 +76,15 @@@ public class VintfObject 
      /**
       * @return a list of VNDK snapshots supported by the framework, as
       * specified in framework manifest. For example,
 -     * [("25.0.5", ["libjpeg.so", "libbase.so"]),
 -     *  ("25.1.3", ["libjpeg.so", "libbase.so"])]
 +     * [("27", ["libjpeg.so", "libbase.so"]),
 +     *  ("28", ["libjpeg.so", "libbase.so"])]
       */
      public static native Map<String, String[]> getVndkSnapshots();
+ 
+     /**
+      * @return target FCM version, a number specified in the device manifest
+      * indicating the FCM version that the device manifest implements. Null if
+      * device manifest doesn't specify this number (for legacy devices).
+      */
+     public static native Long getTargetFrameworkCompatibilityMatrixVersion();
  }

diff --cc core/jni/android_os_VintfObject.cpp
Simple merge