Merge "Select apex variants from lsdump paths" am: f85188cf82

Original change: https://android-review.googlesource.com/c/platform/development/+/1716589

Change-Id: Id658e185b8e94b3f1f208482d1f05bbcdc06f4a8