Merge "Increase the timeout for the aadb test to 15 minutes." into marshmallow-cts-dev