Merge "Add compat checking of the merged APIs" am: 0feadf2006 am: 2ac7949b57 am: 457c516204

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14f662fb58c62123d4a390ccba0145bdea2fee81