am d4a453ce: Merge "Compatibility fix for apps that construct Notification.Builders early" into lmp-preview-dev

* commit 'd4a453ce132c926c136015e6799b0528656c9409':
  Compatibility fix for apps that construct Notification.Builders early