[automerger skipped] Refine AIDL constant definition for TC_MODE_* am:...
[automerger skipped] Refine AIDL constant definition for TC_MODE_* am: 8b977bae -s ours am: ad6083d0 -s ours
am skip reason: Change-Id Iaf5e233666b9a05a86d4951a751145a8e94cb94b with SHA-1 d2c01314 is in history
Change-Id: I93f64c2353491d0eef64afddfa3dd7e1de06a193