[automerger skipped] Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT"...

[automerger skipped] Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" am: 8608d062 am: 8565e714 -s ours am: 7afbed6c -s ours am: b8b51589 -s ours

am skip reason: Merged-In I72660959cb4e638a8e80fcf2f4e96ea172969f44 with SHA-1 016950a4 is already in history

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

Change-Id: Iaa6c1456e651fadafea34e04bb5c8d3e0ec2d7a4