[automerger skipped] Merge "Make ApiLint's new_since arg the merged txt file" am: 9489b44d47 am: c7572c7d64 -s ours
am skip reason: Merged-In I00d25f2ae0ba8f0ee6fa8564d86642efd74e0d44 with SHA-1 4f90aa5148 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1728155
Change-Id: Ife6d3b1191b923e8089bd63aebfd5e6e7e32529b
This commit is contained in: