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

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

Change-Id: I80ed5448b854960cea0ae58c93491990d54ffd86
tree: 399a1ed11728276ad8507c43c5b16d392e6b0365
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING