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

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



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