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

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

Change-Id: If871f48d0f4030b5b9dc5ee4c61adc28e41c8674