Merge "Adding myself as flags owner" into main am: 3d219e06b9 am: 13173af770

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

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