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

Change-Id: I49e4f983950086e9efce025bfe5dc3091789a29f