[automerger skipped] DO NOT MERGE: Tune up kMaxStopCompleteWaitMs to fix NE...

[automerger skipped] DO NOT MERGE: Tune up kMaxStopCompleteWaitMs to fix NE am: bf8f3100 am: 47327fe8 am: 22093e7a -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icfb25e473dbf835def2d96a453399da2b60a7c1e