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

Change-Id: I705e0967e993237d9f1ac2b276e66fab2422f098