Merge "Update AM related owners" into main am: eff5e7d7dc am: 86fc0649eb

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

Change-Id: I16710c0a7285d2865ca46f44c8fc9e7e9ef738fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>