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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41f9bf9bc24c1e7fb5e3fd603208987db6a3c09a