Merge "Avoid duplicate text on keyguard indication" into rvc-dev am: 7a6ee94d am: be9bf948 am: 3914d606 Change-Id: I1e5cd82a339fe95f9830d960e52a705b5b4f9cdf