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

Change-Id: I581633ef0b6393a281b2ca3c47ba85b0743760c2