Merge "Make merged api compat checks output baseline" am: 6c20a2d6b2 am: c010164844 am: 25274a4c6c am: 3afc6af257 am: 5f21da5428

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

Change-Id: I1274c2a17c54768e00733177cb09b0b9fdc45aa0