Merge "Add compat checking of the merged APIs" am: 0feadf2006

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b13b170613c42094d99bcf2992feca287172cc3