Merge "Making the AM team owner of some tests" am: 2c8647da7e am: f20afcb01b am: ba9387a044 am: 6e021316d9

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

Change-Id: I615976133beed16dd12fc572371832cdfff842af