Merge "[framework] Add route type to routingTableEntry." into main am: 4136ebd53c am: 493e17a48b

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

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