Merge changes from topic "lshal-async" into main am: 0e8add7c20 am: 1288d32b1b

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

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