Merge "Update owner" into main am: 1bb69d0417 am: 88ad0ec943

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3455950

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