Merge "Add automotive related keys to AIDL." into tm-dev