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

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

Change-Id: I884d8d9efee65d75ca63dd7d51c9731bfaba3af8