Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" am: f7a327e8d5 am: 086cbfd1bf

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

Change-Id: Ia3dc04920b8941a9528547cf608099195bd948bf