Merge "Merge "new reset carrier signals/actions" am: 5bd39aaf42 am: dc31a45517 am: 89b525afb3" into oc-dev-plus-aosp
am: 1cf64c2ad8

Change-Id: I7924dea822f1d6a0ceb618390818cd358199cf00