[automerger skipped] DO NOT MERGE: Remove incompatible trace config property. am: 6309da0f80 -s ours

am skip reason: subject contains skip directive

Change-Id: I642bcafa796985f499b4c912166e60b63f0ad1a3