Merge "[framework] Handle more possible route string from service." into main am: f3507faaab

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

Change-Id: I9b9a612d67f1d19a40af7479012bb3c1d327f9bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>