[automerger skipped] Merge "DO NOT MERGE: Tune up kMaxStopCompleteWaitMs to...

[automerger skipped] Merge "DO NOT MERGE: Tune up kMaxStopCompleteWaitMs to fix NE" am: 0ff72f5f am: ddbd5158 am: bca23bfa -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idfb2417e0ab920dd9c79be4d6612a4a30d1ca8b5