Merge "Add `compatibility-tradefed` for `libincident_test`" am: ccdfb52a am:...

Merge "Add `compatibility-tradefed` for `libincident_test`" am: ccdfb52a am: 9dc0cfc0 am: 83db59b2 am: 0bea0945 am: 95988d54

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2239393



Change-Id: I4497772e27c9b493e628f2eff1c48ce2ec01e752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>