Merge "Increase default maxWait to 30 seconds." into tm-dev am: ff083ee97d am: 9a1487fcec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17621087 Change-Id: I2ff5f31ff355e39faaf3e449152bf7fabfa9d892 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: