DO NOT MERGE: Tune up kMaxStopCompleteWaitMs to fix NE am: bf8f310071 am: 47327fe826

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1507216

Change-Id: Ide532b4d1d1c93dd7571335b30b370fbdeb66304