Merge "Drop updated jline version from maven" am: 9ee89e2018 am: 8353217012 am: b9386a54b6 am: eb27f03ce7 am: a93da3c1af am: 272c58df7f

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

Change-Id: I61f40af2c981e05716ea267eafe0c04711730eac