Merge "Test apexd behaves correctly when not in fs-checkpoint mode" into...

Merge "Test apexd behaves correctly when not in fs-checkpoint mode" into sc-dev am: b713ec62 am: e807f57d am: 5ad80a86

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

Change-Id: I41eb22c6bdeb2ef9512bba5f42100fd571bb71ef