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

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

Change-Id: I3477f3a78ebee26d950ce6c6eaf45cdef8a5ee6d