Merge changes from topic "am-499f522cabe64cbf9fa120abdbdf4831" into qt-qpr1-dev-plus-aosp

* changes:
  Merge changes from topic "getDeviceCapableModemCount" am: 8ed3fb4bcf am: dd9d9fde68
  Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED. am: 64ff73fe4d am: 23aaf352ea