Merge "Freeze AIDL APIs for TM" into tm-dev