[automerger skipped] Better description and parameter name of setPreferredDataSubscriptionId am: c6c6c41dab am: 8ab3fd180f
am: b520fb4687 -s ours
am skip reason: change_id Ied8ac5baa19ddb946eb98fdcc6c9ccfc47a656d7 with SHA1 fed5de1f43 is in history

Change-Id: Ie8b7c10831373a4d45cc8620e3ff43fbc89cb0de