Merge "Revert "New path for apex-info-list.xml"" into main am: dd5e922a2e am: 1ed6326415

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/2685549

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