Merge "Merge "Add Persian keyboard layout to default layouts" into oc-mr1-dev...
Merge "Merge "Add Persian keyboard layout to default layouts" into oc-mr1-dev am: 6033ab60" into oc-mr1-dev-plus-aosp
am: e089cf9a
Change-Id: I4ef4c8c3722aca8b89d256a4996ef877536664a4