Merge "[AWARE] Add service support for SDEA service info" am: c8b34b1c2c am: aac3de67d3
am: 39354384ab

Change-Id: I1498ceaf5bd43822cc7c77011dceec87ee26ba09