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

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

Change-Id: I3477f3a78ebee26d950ce6c6eaf45cdef8a5ee6d