Merge "Add missing AMC reviewers" am: 7bc8d20b51 am: 19bc7824dc am: a0351a0708

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2d47ff6e5227fcdd307b99c2ca99208944d4784d