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

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

Change-Id: Ifbbd21a48d255c43d6226e2904bfbf2dd0c0c4f3