Merge "Merge "Add more info on control key param" into rvc-dev am: c0e9ca7987 am: 05da4c0367 am: a6696ac168" into rvc-qpr-dev-plus-aosp