Merge "Remove alanstokes@google.com from data/etc/OWNERS" into main am: 295e98dd65 am: 4435cac256

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

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