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: 7e0cbf4d

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

Change-Id: I29f6106e32073af86d466a37450ae28c4b09632e