Merge "Replace the way to add legacy routing" am: aeab3f7d9f am: e963720c4d

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

Change-Id: I363c642663877d7ac521f8e9d5729040deca7f9a