am 47826bfa: am c748341a: Merge "Add addExtras and getExtras to Notification.Builder." into klp-modular-dev

* commit '47826bfa1627fe84bf2ab5d2ee45845bef7b2ff6':
  Add addExtras and getExtras to Notification.Builder.