[automerger skipped] Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" am: 0f04dffd2b am: 8565e71426 -s ours
am skip reason: Merged-In I72660959cb4e638a8e80fcf2f4e96ea172969f44 with SHA-1 4e878ad3f3 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686171
Change-Id: I2644d387bb1667ed5c1153646a78946b68c27301
This commit is contained in: