[automerger skipped] Merge "Fix ApexManager#snapshotCeData (3/n)" am: 3a9796a8 am: 299da8f7 am: 85de24f3 -s ours

am skip reason: Change-Id I10ed0e3adef88a27ee239c183d99a836b623d0d1 with SHA-1 6d8e4e5a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70dbc6cca301cd27a913e021a6ffa9ad017bf858