Merge "Fixed several data issues" am: 90ee4528a3 am: 6c4b32c7e4 am: 49fe62daac

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

Change-Id: I59a13d9508cbe9572cfd6d8e4772e94c69c24eaa