Merge "Add synchronized to make sure data correctness" am: e50b18b0c6 am: 055310bc2f am: 88f5094c1b am: 99a668c80a

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

Change-Id: I5754bdb872595922f30135613abeb2930ff1c650