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 am: b0668bad am: 054d327a am: 25e6062e am: 92f07bd2

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



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