Merge "Remove hidden method link in public addRoute API" am: fe09ad78cd am: ee651a8d1a am: 11325e1594

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

Change-Id: I80ed5448b854960cea0ae58c93491990d54ffd86