Merge "Remove new TestAPI in NotificationRankingUpdate" into main