Merge "Don't cap the targetSDK for change id's in UI" am: 816f4ed50f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I797c4b3ab274b360a6686109539e8e13767676f4