Merge "Dialing phone state should update active sub" into sc-v2-dev am: 7243bacd am: 05205731

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

Change-Id: I058ebc767dcc679214426528faf4d6baacabb47a