Settings: Improve AOSP & CM AOSP JA translation

Change-Id: Iafda95ac029896068989ac012be1b95b5a0d4adc
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0