Android 14.0.0 Release 31 (AP1A.240405.002.A1)
Merge "Fix module-file name collisions" am: e4793273da am: 713073831f am: 3e21821be8 am: 5e78e9e93a am: c2aaa90b6e

Original change: https://android-review.googlesource.com/c/platform/sdk/+/2201971

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