Merge "[AWARE] Add support for SDEA.ServiceInfo field"
am: 97c3540042

Change-Id: Ic47df91fd4e2a8dc72d9a825079a8cfa3f633444