Merge "codec2: add ION usage mapper to the sample service"
am: a6f7d915bb

Change-Id: Ia941336aea37524e250ffa399a5b74260a618d33