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

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

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



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