Merge "Add some comments about thread-safety" am: d0c6e0fa08

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I547e6031e095b5d70e288332dd451635b048333f