Merge "Update KeyguardIndicationController" into sc-dev