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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I248deea83ca79f0df4b63527ec5eb9d9c4730689