Merge "Eliminate StatusBarNotifActivityStarter.Builder" into tm-dev am: 1dd831e873 am: e1787fa6af

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17004233

Change-Id: I3f9e2cf24763bd76be6139c737d292be213880b6