Merge "Drop updated jline version from maven" am: 9ee89e2018 am: 8353217012

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

Change-Id: I45ea8ecce55637de37047fdb6cb3a08f7706d8a8