tree 99f1c34ff45e18e26d453ed493fbbc2be019595c
parent 4be2e3f81d3693bb2bbbbae88d216058854eaaa1
parent 93380ab8f3f49aed0fd5aa65a745e100dcd207e4
author Holly Jiuyu Sun <jiuyu@google.com> 1547593110 -0800
committer android-build-merger <android-build-merger@google.com> 1547593110 -0800

[automerger skipped] Merge "Allow privileged carrier app to update subscription nickname." am: 81801283e3 am: a5972ee708
am: 93380ab8f3 -s ours
am skip reason: change_id I63c5ec4366f32735a54adf40b9cc0b47af681736 with SHA1 5b44f9b4c2 is in history

Change-Id: Ib63b0838baa4d55d6520172012b2e6f48da966db