Merge "Rename some method to indicate that should add lock to use this...

Merge "Rename some method to indicate that should add lock to use this methods." into main am: 649719b6

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



Change-Id: I642069a671338d564b7986c5c334e5d62d529865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>