Merge "Add components info in CTS owners file" am: 6689e933cf am: 9d65f6821e

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

Change-Id: Ibd8cf8e230fa2d1cc25f5cb9c40b417e19829b68