Merge "Standardise safety comments for unsafe blocks, and add some more." into...

Merge "Standardise safety comments for unsafe blocks, and add some more." into main am: f56c8b1e am: a98f7e2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2652159



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