Merge "Increase timeout values for callback" into sc-dev am: df1b82560a

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

Change-Id: Ifb7f571b495b66a7fe57521022767cf8b9baa415