[automerger skipped] Merge "Populate activeApexChanged in ActiveApexInfo" into...

[automerger skipped] Merge "Populate activeApexChanged in ActiveApexInfo" into tm-dev am: 5157101a am: e6415a9d am: f1e1ded9 -s ours

am skip reason: Merged-In I0ecdf758567fb8677a676d7c39f6b35cdc1208ac with SHA-1 d4838ac4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331942



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