[automerger skipped] Merge "[Cherry-pick] Group methods with similar purpose."...

[automerger skipped] Merge "[Cherry-pick] Group methods with similar purpose." into main am: 1a512135 am: 74ee2f75 -s ours am: b923f115 -s ours

am skip reason: Merged-In I8654b19d3a582477ea59cbff875b5ecf0817d06d with SHA-1 433c800c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2794753



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