Android 12.1.0 release 23
Merge "Drop updated jline version from maven" am: 9ee89e2018 am: 8353217012 am: b9386a54b6 am: eb27f03ce7

Original change: https://android-review.googlesource.com/c/platform/external/jline/+/1695885

Change-Id: I78f0a34dd9898bd07eb202a8e07fdb03a58d7829