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

Merge "lshal: Allow injecting wait values for test" into main am: 7b05d26f am: e194bf28 am: 3ef1703d

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



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