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

Merge "System routes are not automatically exposed" into rvc-dev am: c8f4a8a5 am: 460ba3e6 am: 15728f11 am: eb7ea74d

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

Change-Id: Ib0e02cae9d443c96590979a5bf288e389890f03d