Merge "Allow excludeLocalRoutes set only in bypassable profile" am: eaa3fc76a8 am: e6c1b94120

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

Change-Id: I14f0fe8795aa6f90c13bf764db45ce5e234268ff