[automerger skipped] Merge "Also populate lastUpdateMillis in ActivateFlattenedApexesIfPossible" into sc-dev am: b7f123fb66 -s ours am: 8b50cea618 -s ours

am skip reason: Merged-In I11dca132168d6a30372d7a68fe590894d3cc5ccf with SHA-1 1f662999e3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15175439

Change-Id: I7cfca0577bb5c71d3aba823c656ebb1f56f34af8