Merge changes from topic "comm_routing" am: 8553f77dce

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35def97c4eda8d484e42addde6b43377d748f578