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

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

Change-Id: Iaa5c66e4fd075d5913a1cbb99f0cc35a09730f28