[automerger skipped] Merge "Sort PRODUCT_UPDATABLE_BOOT_JARS." am: 87013762...

[automerger skipped] Merge "Sort PRODUCT_UPDATABLE_BOOT_JARS." am: 87013762 am: 96b680d8 am: 88a20362 -s ours am: eb33b7b8 -s ours am: d9ed3749 -s ours

am skip reason: Merged-In I15512c0da79ad94b547325d563dac473c006f9fd with SHA-1 9425daba is already in history

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

Change-Id: Ifde0540f63cbe211d176e35627f2af170adbb3da