Merge "Merge "Default silent notifs on lockscreen to on" into qt-dev am: a501bbc75c am: 8d1b128ede" into qt-r1-dev-plus-aosp
am: a561b013e2

Change-Id: Ia9e263ca7caace2a74aa1b88a02e1809b830c539