Merge "Resend remaining VMAs on partial compaction due to failure" into tm-dev am: a47d028e am: 06d00ed6 am: 4c212c97 am: a25d9cd7

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



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