Merge "[RTT] LCI/LCR to System API - unparsed"

diff --cc api/current.txt
Simple merge

diff --cc api/system-current.txt
Simple merge

diff --cc wifi/java/android/net/wifi/rtt/RangingResult.java
index 5c9bd19,fbec0f1..05927f0
--- 1/wifi/java/android/net/wifi/rtt/RangingResult.java
--- 2/wifi/java/android/net/wifi/rtt/RangingResult.java
+++ b/wifi/java/android/net/wifi/rtt/RangingResult.java
@@@ -40,9 -42,10 +42,10 @@@ import java.util.Objects
   */
  public final class RangingResult implements Parcelable {
      private static final String TAG = "RangingResult";
+     private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
  
      /** @hide */
 -    @IntDef({STATUS_SUCCESS, STATUS_FAIL})
 +    @IntDef({STATUS_SUCCESS, STATUS_FAIL, STATUS_RESPONDER_DOES_NOT_SUPPORT_IEEE80211MC})
      @Retention(RetentionPolicy.SOURCE)
      public @interface RangeResultStatus {
      }