Merge "Set verbosity for api_versions_trimmer_unittests" am: 3b63045444 am: 86ac824eb9 am: ace5d30a1d am: b7105599ad am: 7335ef8e09

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

Change-Id: I1b41d956956888f96596415f13693a39936ad100