Merge "Add synchronized to make sure data correctness" am: e50b18b0c6 am: 055310bc2f

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

Change-Id: I10fef610f00d88694551ac00255ebbe5f82ed9e0