Merge "Standardise safety comments for unsafe blocks, and add some more." into main am: f56c8b1e06 am: a98f7e2a93 am: b0668badd8 am: 054d327a53 am: 25e6062e85

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

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