Merge "Merge "Avoid duplicate text on keyguard indication" into rvc-dev am: 7a6ee94d am: be9bf948 am: 3914d606" into rvc-qpr-dev-plus-aosp