Merge "[automerger skipped] Merge "Adding callback for setPreferredDataSubscriptionId." am: 442084c722 am: 7a2dd73329 am: 879255e83e -s ours am skip reason: change_id Id3f43e024c902d6785017e7866f9e804a486b04f with SHA1 b2b88b3735 is in history"