Merge "Fixed several data issues" am: 90ee4528a3 am: 6c4b32c7e4 am: 49fe62daac am: 9e47855819
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2034143 Change-Id: Ifbc14c6d91f83aa47c86cbe61c8d2586c5741047
This commit is contained in: