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

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

Change-Id: Ibf3ef520e841a065225b15992fb924ada58ea828