am 0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev

* commit '0ff811db58089e7b4e8fbca4f41be8f20c86ce10':
  Add local-only option to Notification (using flag)