Merge changes from topic "cas-aidl-frameworks"

* changes:
  CAS: Add @hide annotations
  CAS: Update ScramblingMode enum order