Merge "frameworks_base: CA translations" into cm-10.2

Change-Id: If17146d970655c072de7ed4916a7d47725f69120