Merge "Merge "Revert "Resend remaining VMAs on partial compaction due to...

Merge "Merge "Revert "Resend remaining VMAs on partial compaction due to failure"" into tm-dev am: 11879837 am: 1799b892 am: 7aa68e3f" into tm-qpr-dev-plus-aosp am: 0e4b7de8

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



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