Change header string to 'Screen lock' and remove a duplicated 'Lock screen message' Bug: 35960702 Test: manual Change-Id: I9924ae18e99065f83556520f259ed74d9028637e
Bug: 32953042 Test: robotests Change-Id: Iecdb0a42695644ff8aa095bcd49b5ccb16aa46d4