[automerger skipped] Merge "Also populate lastUpdateMillis in ActivateFlattenedApexesIfPossible" into sc-dev am: b7f123fb am: 32cb4c9a -s ours

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

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

Change-Id: I84a66a1e05eb3370069c55d4d67b033f7f5527c8