[automerger skipped] Merge "Convert extension functions to regular functions." into main am: 74cb5af850 am: a3eb4c65e8 -s ours

am skip reason: Merged-In I5c5e34497f6dd05cdb67d7d65ac335db617ebb25 with SHA-1 1fe394dada is already in history

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

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