Merge "Fix thread safety issues;" am: a1431a8227

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

Change-Id: I0a21018e46acffa35c9e337b1f39d381c98a1754