Merge "Adding myself as flags owner" into main am: 3d219e06b9 am: 784b58f2f8

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

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