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

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

Change-Id: Id19a3cea3c26efb3ebf6401f361c103a07eb423e