Merge "Add ViewController for KeyguardBottomAreaView." into tm-qpr-dev