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

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

Change-Id: I2d6ca83f466ba1b8411de01ec8d98d9c43a02d7e