Merge "Resend remaining VMAs on partial compaction due to failure" into tm-dev am: a47d028e am: 40e7c81c am: f02d76ae am: 4db215d0

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



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