Merge "Add logging to KeyguardNotifVisProvider" into tm-dev