Merge "Stop using sbn.cloneLight in NotifRankingManager"