Merge "Merge "Controls Ui - Remove temporary 'success' msg" into rvc-dev am: 9f63e946d1 am: 2caf7fa79d" into rvc-d1-dev-plus-aosp am: 5d4d3e152d

Change-Id: Iec715a6a5f26ae97d5b4b751f3f9e211cff7e742