Merge "Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into lollipop-cts-dev