Merge "LOCAL_REQUIRED_MODULES from apex has ":32" or ":64" suffix" am: d684e042

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b48d2e124f936c85339426d93e474be67c59856