Merge changes from topic "lshal-async" into main am: 0e8add7c

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



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