Merge "Add nona to owner of Paint" into main am: c3bfb51870 am: abd1893a07

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

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