Merge "Allow tethering pick prefix from all of private address range" am: 5b976f3516 am: a303fc56ed

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

Change-Id: Ie44f3b2ebfa51d2c915bd794b6ea0fade0098ecf