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

Change-Id: I869efbd602fb484960dfca484b9ee4d9fb14ee5b