Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e
am: 3067da37c1

* commit '3067da37c1e945245274ae638373f200d0ff2d29':
  Additional clean up in onUserRemovedLPw

Change-Id: I845144d4487a39973427f39c0b93b5a8acbc9f9b