Android Mainline 12.0.0 Release 63 (7993649,com.google.android.networkstack)
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: I802d14cc3cefa80c1578f7a8accf2f8348832b0e