Merge "Allow privileged carrier app to update subscription nickname."
am: 81801283e3

Change-Id: Ic8266c3cad813a21b2ef8b34c1a6825f5f3c231c