Merge "Add libincident_test to MTS" into rvc-dev am: 003ef4903a am: 40c4fad297

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

Change-Id: If6708759480aa14a7ff5d381d1f89c965ba0eee9