Merge "Add versioning to app compat framework" am: 80bbdfd100

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4796325c84396082256cec7c66fd1efdc623d36