Merge "Add setSubscriptionOverride() to system API" am: f734372173

Change-Id: I80a7cae65eaefad94afa428c27c84338142bd224