Merge "System routes are not automatically exposed" into rvc-dev am:...

Merge "System routes are not automatically exposed" into rvc-dev am: c8f4a8a5 am: 387622bd am: 2af20b1c am: eb7f914d

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

Change-Id: I5422df43bfc0f46dd4680a3bb905170bb48d264f