[Next][Android] Notifications refactor due to upstream changes.