Merge "Merge "KeyguardBottomAreaView new impl. - data layer" into tm-qpr-dev am: d3a180b0fc" into tm-qpr-dev-plus-aosp