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

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

Change-Id: Iaebf0aa5f0805c961b72c00730e3f60e195680e3