Merge "Fix several bugs from cts test through aidl clearkey"