Android S Beta 3
Merge "Drop updated jline version from maven" am: 9ee89e2018

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

Change-Id: I76cf5cf38e2f018903473038262f25431d8d5ab7