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

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

Change-Id: Ie6fee224b995af4ace0b74a5508e21f1e008ba0b