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

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

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