Updates to support FEATURE_WATCH devices

This is a squashed patch of the CMAS changes made in F
plus a title change requested for G

Bug: 62418695, 37688456
Test: Manual with test app
Change-Id: I5439e31bb1bc572bc803224b3c4374591668568f
(cherry picked from commit 5308c8572c96438cdf75859394921dc28f7d56e1)
8 files changed