Revert "clear conflicts"

This reverts commit c7573ea7b601b1ea7dd3ea57ac39811072a16ecf.
Revert "clear conflicts"

This reverts commit d548d7734fc9322895d26e7d622b40cf8c886a33.
Revert "[2/2] LS Notifications dinamic width & blacklist options"

This reverts commit cc13e611b7b82ee514ebe3c3e726e8892fada3eb.
Revert "[2/2] Losckscreen Notifications fixes"

This reverts commit 883d0ac92906d9d878a7e736087579dbccf3fb01.
Revert "clear conflicts"

This reverts commit 9754e02f0327bfe942f6fbb392f98fcd685e3ace.
Revert "[2/2] Settings: LockScreen Notifications by AOSPAL"

This reverts commit c9a5fc346d5eff824d32e5e8ed5ef1b8c87c17ec.