Merge "Add a delay() to MessageBundleTest tearDown()" into oreo-cts-dev