Merge "System MR2: Fix bug on onTransfer and on getting initial routes" into sc-dev am: 9505f1d4 am: 4c87b43c

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

Change-Id: I903a9d1ce6e04983deca01328707df7894a1d6ca