Merge "Merge "Controls API - Flag controls support" into rvc-dev am:...
Merge "Merge "Controls API - Flag controls support" into rvc-dev am: 897187dc am: 3c109b83" into rvc-d1-dev-plus-aosp am: aac7ae00
Change-Id: Ic8d0ed953cb8b35cdfe5116bb50a6374a5530298