Merge "Run additional compat checks for checkapi" am: 6196e669 am:...

Merge "Run additional compat checks for checkapi" am: 6196e669 am: 335f3fc4 am: 151ac184 am: ac18d1ab

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



Change-Id: Ifd5e5217aa8f6273a92458cb94aacf9f27dbdef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>