Merge "Use locale text direction in keyguard carrier text" into pi-dev
am: f55385b595

Change-Id: I56c154b669de32f5ac6584c7e4a7546195ce4233