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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94e081e31050fdb2b66cd3a510d68dcaf70da5fe