Merge "Make testMultipleMessagesDispatched slightly less overspecified." am: b9787b1ea7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030263

Change-Id: I812132f8f47eda30defbc743162a75e6eab64a1f