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

Change-Id: I33f2ee636be99c3cfba706dc581415881b5f11c3