Merge "Revert "Adds LongPressHandlingView to KeyguardRootView."" into udc-qpr-dev