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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I223d5e23410130f3c8b4c056e097670685dde9c8