Merge "Remove TunnelConnectionParams interface" am: b8f67d1bd7 am: b1578de55a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684427

Change-Id: I59c4fdda3f3dcedcf94bdb6bdc826ec64bb78370