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

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

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