Merge "Making the AM team owner of some tests" am: 2c8647da7e

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

Change-Id: Ie4ae86f0013a7a0212a7780ee13b64c87108d63e