Merge "Add Persian keyboard layout to default layouts" into oc-mr1-dev
am: 6033ab604f

Change-Id: Iaeceffc39a96bd499f807bb32747b7865c95be3a