Merge "Set TIMEOUT_COMMIT_CALLBACK_MS / TIMEOUT_COMMIT_CALLBACK_SEC to 100 for low booting performance device" am: affcb607fc am: 69ab522f30

Original change: https://android-review.googlesource.com/c/platform/cts/+/1729591

Change-Id: I1db65975f553f32f86b9d9c540a70cecab5a8766