Merge "Added strings used by car keyguard overlay" into pi-dev
am: c1e05c4af5

Change-Id: I20e1e5e41552fd51982eea8232d3b61f3a086bab