Merge "Remove hidden method link in public addRoute API" am: fe09ad78cd am: 79edf2d346 am: 01d4caea3c

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

Change-Id: I80ed5448b854960cea0ae58c93491990d54ffd86
tree: 1adab2ffc5bcd8084f6869c0e3a920dd16f0a9fe
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING