Merge "Fix ApexManager#snapshotCeData (3/n)" am: 3a9796a8c6 am: 299da8f790

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8eafd6289ef9aede446b3b7c16dd30b29fd25d9