Merge "DO NOT MERGE: Fix com.android.cts.monkey.VerbosityTest#testVerbosity seldom fail" into kitkat-cts-dev