Merge "DO NOT MERGE: Tune up kMaxStopCompleteWaitMs to fix NE" am: 0ff72f5f4b am: ddbd5158df

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

Change-Id: I74c15f8699811328f720441a3d34187a9529736b