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 am: 7989a89b

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

Change-Id: Ibdb7f77d8cb8def4c99f2bd71c5e2a5b566bed61