Merge "Remove hidden method link in public addRoute API" am: 7e1afe7650

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

Change-Id: Ide004783057673561ea631e0a59ce4c01c2841af