Merge "Make merged api compat checks output baseline" am: 6c20a2d6b2

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

Change-Id: If57aae144cb15d6704a36311b358e892f8ae4f2f