Merge "lshal: Allow injecting wait values for test" into main am: 7b05d26f3f

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

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