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

[automerger skipped] Merge "Populate activeApexChanged in ActiveApexInfo" into tm-dev am: 5157101a am: 0a13eb6b am: 189daff3 am: b89b22b2 -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: I22db6bb5a5d45e38ab9529285de56da5c7f971d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>