Merge "More descriptions on SubscriptionController#setPreferredData" am: 16fcd3dcff
am: 247f18f47a

Change-Id: Id25f73dc5a0bd91c78f3822d31a6b37f7b488d5c