Merge changes from topic "comm_routing" am: 8553f77dce am: 10c6362030

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8c5ace4fd7636db42e14523557604fb5d80542a