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

Change-Id: I6e2b1496d2868787d7173ed239f8b6b6081b0d99