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

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

Change-Id: If2ab293489079b62e8196cd629b18af78ddd8f9c