Merge "Use same symbol for all receiver functions" into main am: 7ae5a5b8...

Merge "Use same symbol for all receiver functions" into main am: 7ae5a5b8 am: 1ceda3d5 am: 99ccb40d am: 3bee26a6 am: e16f819e

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2756985



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