[automerger skipped] Merge "Add @jorgegil to freeform and tests owners (cherry...

[automerger skipped] Merge "Add @jorgegil to freeform and tests owners (cherry picked from https://android-review.googlesource.com/q/commit:386b86e8e1102c5d7e0d9caaec936efae5d4db60)" into udc-dev am: ec160013 -s ours am: 5cdd6836 -s ours

am skip reason: Merged-In I4c363e67736460ab01118847ce57592edd0f1a50 with SHA-1 386b86e8 is already in history

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



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