Merge "Add bug component " am: 1de335cecc am: 4e679cd484

Original change: https://android-review.googlesource.com/c/platform/cts/+/2323653

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