Merge "[AWARE] Fix visibility of Aware Characteristics API" am: 13c76b77dc am: 60e6734100
am: 5f9b3d834b

Change-Id: I50b5ef421fcaf8d7ec83bb00024f048dcd5378c0