Merge "Make Notification.Builder.SetFlag public"
am: c8bd4aecb3

Change-Id: I3b8ff8e7c754b12778e40a9abcc829fb7a12671b