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

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

Change-Id: Ie371a814f1aba77290440d5b0bf275ede838e161