Use2GOnlyCheckBoxPreference: fix NPE

Change-Id: Iacedd9f8eefb2d7f8ecdec4c0f1595448edbaf9f
Add JNI dependencies for user builds

 * JNI libs weren't being built on user builds. Fixit!

Change-Id: Ia5fa6a994c0110ca44d5b87f60563bf7d4aef3e6
Revert "Phone: Display Supplementary Service Notifications"

This reverts commit d27d964e41bd33059baecc7312b7180f25c81a7c and
restores our own SSN handling.

Change-Id: Ib61a3e94599f684e414e98969712aaa285714b79
Phone: zh_CN translation

Change-Id: Ibd40b262901d561588bf593be9127d0547a7feed
telephony-msim: Fix package errors

 * Move this stuff to the correct directory.

Change-Id: Icc91c0a7620857ef5b00c570ce42608f93d54dda
Merge remote-tracking branch 'upstream/cr-main-10.2' into cm-10.2