Merge "Retry to get and mount CE data directory again" am: 5737120c84 am: 57fef24446

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

Change-Id: I0096c214ff5417cb6a1e57ca57d4f0cf271a02e7