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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I892a8acbb6378e1833703805967e2c1039b87d38