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