Merge "Remove async_safe references." am: 98933d4551 am: 1ab38625b4 am: c4c81b0cee

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2526780

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