[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4...

Change-Id: I5a6d8519fc77c96d2df7afc58c1d45af57250e8b

diff --cc wifi/java/android/net/wifi/RttManager.java
index 590ff1b,ea07033..8c96774
--- 1/wifi/java/android/net/wifi/RttManager.java
--- 2/wifi/java/android/net/wifi/RttManager.java
+++ b/wifi/java/android/net/wifi/RttManager.java
@@@ -766,10 -730,9 +766,10 @@@ public class RttManager 
                      }
                      dest.writeByte(result.LCR.id);
                      if (result.LCR.id != (byte) 0xFF) {
-                         dest.writeInt((byte) result.LCR.data.length);
-                         dest.writeByte(result.LCR.id);
+                         dest.writeByte((byte) result.LCR.data.length);
+                         dest.writeByteArray(result.LCR.data);
                      }
 +                    dest.writeByte(result.secure ? (byte) 1 : 0);
                  }
              } else {
                  dest.writeInt(0);