Merge "Order entries in apex_info.pb" am: 6fb4c8dc am: f4c40a7e

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



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