Merge "Eliminate StatusBarNotifActivityStarter.Builder" into tm-dev