Merge "Add stable AIDL parcelables for LinkProperties" am: c37177a7d6 am: e45592f5fd
am: 15f85cd5f2

Change-Id: I81b1d0405d144dc8b053c6f3961a5542de4dd0ec