Merge "Revert "[Aware] Support set cluster id in AIDL""